Fix Controller (catch NullPointerException)