added a try/catch for to catch npe
Merge branch 'next' of github.com:dideher/minoas into next