Corrected "got interrupted" and "null command" behavior