Added ability to request editor to be displayed
Fixed error message
Added missing error message