Un-official 1.51 Update

The update fixes issues caused due to 1.50 update. Reason: Missing
options node caused the application to crash. Added error handling to
fix that issue.