[master][PATCH] Check _current_action for not being None before using it